projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39b0acb 992bd5b)
bitkeeper revision 1.11 (3e007601VWqgtLQS5H6vaQ9Ezdz0TQ)
authorsmh22@uridium.cl.cam.ac.uk <smh22@uridium.cl.cam.ac.uk>
Wed, 18 Dec 2002 13:20:01 +0000 (13:20 +0000)
committersmh22@uridium.cl.cam.ac.uk <smh22@uridium.cl.cam.ac.uk>
Wed, 18 Dec 2002 13:20:01 +0000 (13:20 +0000)
Merge uridium.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into uridium.cl.cam.ac.uk:/anfs/scratch/boulderdash/smh22/xeno.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
BitKeeper/etc/logging_ok patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc BitKeeper/etc/logging_ok
Simple merge
Unnamed repository; edit this file 'description' to name the repository.